From 24ba7c80661a5bb6a5ac612733335ed4579e6276 Mon Sep 17 00:00:00 2001 From: Lukas Lueg Date: Tue, 26 Sep 2017 09:54:07 +0200 Subject: [PATCH] Reset unneeded lint changes --- src/cargo/core/registry.rs | 1 + src/cargo/core/resolver/mod.rs | 2 +- src/cargo/core/workspace.rs | 9 ++++++--- src/cargo/ops/cargo_generate_lockfile.rs | 4 ++-- src/cargo/ops/cargo_new.rs | 13 +++++++------ src/cargo/ops/cargo_read_manifest.rs | 11 ++++++----- src/cargo/ops/cargo_rustc/context.rs | 2 +- src/cargo/ops/cargo_rustc/custom_build.rs | 6 +++--- src/cargo/ops/cargo_rustc/fingerprint.rs | 12 ++++++++++-- src/cargo/ops/cargo_rustc/mod.rs | 8 ++++---- src/cargo/sources/path.rs | 23 +++++++++++------------ 11 files changed, 52 insertions(+), 39 deletions(-) diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 7052ba509..517486801 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -309,6 +309,7 @@ http://doc.crates.io/specifying-dependencies.html#overriding-dependencies dependencies; the dependency on `{}` was removed\n\n {}", override_summary.package_id().name(), id.name(), boilerplate); self.source_config.config().shell().warn(&msg)?; + return Ok(()) } Ok(()) diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index 573a6be1c..b605742d4 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -478,7 +478,7 @@ impl RcVecIter { impl Clone for RcVecIter { fn clone(&self) -> RcVecIter { RcVecIter { - vec: Rc::clone(&self.vec), + vec: self.vec.clone(), rest: self.rest.clone(), } } diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index 48d379343..9c012bf22 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -392,10 +392,13 @@ impl<'cfg> Workspace<'cfg> { } let root = root_manifest.parent().unwrap(); - if let WorkspaceConfig::Root { ref members, ref exclude } = *self.packages.load(root_manifest)?.workspace_config() { - if is_excluded(members, exclude, root, &manifest_path) { - return Ok(()) + match *self.packages.load(root_manifest)?.workspace_config() { + WorkspaceConfig::Root { ref members, ref exclude } => { + if is_excluded(members, exclude, root, &manifest_path) { + return Ok(()) + } } + _ => {} } debug!("find_members - {}", manifest_path.display()); diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index 7be8ae05a..d07ee9672 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -162,10 +162,10 @@ pub fn update_lockfile(ws: &Workspace, opts: &UpdateOptions) let mut changes = BTreeMap::new(); let empty = (Vec::new(), Vec::new()); for dep in previous_resolve.iter() { - changes.entry(key(dep)).or_insert_with(|| empty.clone()).0.push(dep); + changes.entry(key(dep)).or_insert(empty.clone()).0.push(dep); } for dep in resolve.iter() { - changes.entry(key(dep)).or_insert_with(|| empty.clone()).1.push(dep); + changes.entry(key(dep)).or_insert(empty.clone()).1.push(dep); } for v in changes.values_mut() { diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index b7b30f7e2..9c597df85 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -175,12 +175,12 @@ fn detect_source_paths_and_types(project_path : &Path, } let tests = vec![ - Test { proposed_path: String::from("src/main.rs"), handling: H::Bin }, - Test { proposed_path: String::from("main.rs"), handling: H::Bin }, + Test { proposed_path: format!("src/main.rs"), handling: H::Bin }, + Test { proposed_path: format!("main.rs"), handling: H::Bin }, Test { proposed_path: format!("src/{}.rs", name), handling: H::Detect }, - Test { proposed_path: format!("{}.rs", name), handling: H::Detect }, - Test { proposed_path: String::from("src/lib.rs"), handling: H::Lib }, - Test { proposed_path: String::from("lib.rs"), handling: H::Lib }, + Test { proposed_path: format!("{}.rs", name), handling: H::Detect }, + Test { proposed_path: format!("src/lib.rs"), handling: H::Lib }, + Test { proposed_path: format!("lib.rs"), handling: H::Lib }, ]; for i in tests { @@ -406,7 +406,8 @@ fn mk(config: &Config, opts: &MkOptions) -> CargoResult<()> { let in_existing_vcs_repo = existing_vcs_repo(path.parent().unwrap_or(path), config.cwd()); let vcs = match (opts.version_control, cfg.version_control, in_existing_vcs_repo) { (None, None, false) => VersionControl::Git, - (None, Some(option), false) | (Some(option), _, _) => option, + (None, Some(option), false) => option, + (Some(option), _, _) => option, (_, _, true) => VersionControl::NoVcs, }; match vcs { diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs index dc8b74786..19d9f6aef 100644 --- a/src/cargo/ops/cargo_read_manifest.rs +++ b/src/cargo/ops/cargo_read_manifest.rs @@ -1,5 +1,4 @@ use std::collections::{HashMap, HashSet}; -use std::collections::hash_map::Entry; use std::fs; use std::io; use std::path::{Path, PathBuf}; @@ -138,10 +137,12 @@ fn read_nested_packages(path: &Path, }; let pkg = Package::new(manifest, &manifest_path); - match all_packages.entry(pkg.package_id().clone()) { - Entry::Occupied(_) => { info!("skipping nested package `{}` found at `{}`", - pkg.name(), path.to_string_lossy()); }, - Entry::Vacant(e) => { e.insert(pkg); } + let pkg_id = pkg.package_id().clone(); + if !all_packages.contains_key(&pkg_id) { + all_packages.insert(pkg_id, pkg); + } else { + info!("skipping nested package `{}` found at `{}`", + pkg.name(), path.to_string_lossy()); } // Registry sources are not allowed to have `path=` dependencies because diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index 219d16846..219496af8 100755 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -429,7 +429,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> { /// Return the target triple which this context is targeting. pub fn target_triple(&self) -> &str { - self.requested_target().unwrap_or_else(|| self.host_triple()) + self.requested_target().unwrap_or(self.host_triple()) } /// Requested (not actual) target for the build diff --git a/src/cargo/ops/cargo_rustc/custom_build.rs b/src/cargo/ops/cargo_rustc/custom_build.rs index fee750c4c..ad1178800 100644 --- a/src/cargo/ops/cargo_rustc/custom_build.rs +++ b/src/cargo/ops/cargo_rustc/custom_build.rs @@ -143,9 +143,9 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) match *cfg { Cfg::Name(ref n) => { cfg_map.insert(n.clone(), None); } Cfg::KeyPair(ref k, ref v) => { - if let Some(ref mut values) = *cfg_map.entry(k.clone()) - .or_insert_with(|| Some(Vec::new())) { - values.push(v.clone()) + match *cfg_map.entry(k.clone()).or_insert(Some(Vec::new())) { + Some(ref mut values) => values.push(v.clone()), + None => { /* ... */ } } } } diff --git a/src/cargo/ops/cargo_rustc/fingerprint.rs b/src/cargo/ops/cargo_rustc/fingerprint.rs index fdd37f05f..f78274ac5 100644 --- a/src/cargo/ops/cargo_rustc/fingerprint.rs +++ b/src/cargo/ops/cargo_rustc/fingerprint.rs @@ -287,8 +287,16 @@ impl Fingerprint { impl hash::Hash for Fingerprint { fn hash(&self, h: &mut H) { - let Fingerprint { rustc, ref features, target, profile, ref deps, - ref local, ref rustflags, .. } = *self; + let Fingerprint { + rustc, + ref features, + target, + profile, + ref deps, + ref local, + memoized_hash: _, + ref rustflags, + } = *self; (rustc, features, target, profile, local, rustflags).hash(h); h.write_usize(deps.len()); diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 6a12a215c..3e7fdbd2f 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -295,7 +295,7 @@ fn rustc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, let kind = unit.kind; // Prepare the native lib state (extra -L and -l flags) - let build_state = Arc::clone(&cx.build_state); + let build_state = cx.build_state.clone(); let current_id = unit.pkg.package_id().clone(); let build_deps = load_build_deps(cx, unit); @@ -323,7 +323,7 @@ fn rustc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, let target = unit.target.clone(); exec.init(cx, unit); - let exec = Arc::clone(&exec); + let exec = exec.clone(); let root_output = cx.target_root().to_path_buf(); @@ -645,7 +645,7 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, rustdoc.args(&cx.rustdocflags_args(unit)?); let name = unit.pkg.name().to_string(); - let build_state = Arc::clone(&cx.build_state); + let build_state = cx.build_state.clone(); let key = (unit.pkg.package_id().clone(), unit.kind); Ok(Work::new(move |state| { @@ -690,7 +690,7 @@ fn build_base_args<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, let Profile { ref opt_level, lto, codegen_units, ref rustc_args, debuginfo, debug_assertions, overflow_checks, rpath, test, doc: _doc, - run_custom_build, ref panic, check, .. + run_custom_build, ref panic, rustdoc_args: _, check, } = *unit.profile; assert!(!run_custom_build); diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 980d311fa..11760c29a 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -217,14 +217,14 @@ impl<'cfg> PathSource<'cfg> { ))?; } } else if no_include_option { - self.config - .shell() - .warn(format!( - "Pattern matching for Cargo's include/exclude fields is changing and \ - file `{}` WILL NOT be excluded in a future Cargo version.\n\ - See https://github.com/rust-lang/cargo/issues/4268 for more info", - relative_path.display() - ))?; + self.config + .shell() + .warn(format!( + "Pattern matching for Cargo's include/exclude fields is changing and \ + file `{}` WILL NOT be excluded in a future Cargo version.\n\ + See https://github.com/rust-lang/cargo/issues/4268 for more info", + relative_path.display() + ))?; } else { self.config .shell() @@ -451,9 +451,8 @@ impl<'cfg> PathSource<'cfg> { let name = path.file_name().and_then(|s| s.to_str()); // Skip dotfile directories if name.map(|s| s.starts_with('.')) == Some(true) { - continue; - } - if is_root { + continue + } else if is_root { // Skip cargo artifacts match name { Some("target") | Some("Cargo.lock") => continue, @@ -532,7 +531,7 @@ impl<'cfg> Source for PathSource<'cfg> { // as 0. let mtime = fs::metadata(&file).map(|meta| { FileTime::from_last_modification_time(&meta) - }).unwrap_or_else(|_| FileTime::zero()); + }).unwrap_or(FileTime::zero()); warn!("{} {}", mtime, file.display()); if mtime > max { max = mtime; -- 2.30.2